From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 3 Jul 2026 13:26:54 +0000 (+0100)
Subject: Merge version 3.2.0-2+rpi1 and 3.3.0-1 to produce 3.3.0-1+rpi1
X-Git-Tag: archive/raspbian/3.3.0-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=8a1ac96c758453fc6e14130b848b00e45301e8a7;p=qbs.git

Merge version 3.2.0-2+rpi1 and 3.3.0-1 to produce 3.3.0-1+rpi1
---

8a1ac96c758453fc6e14130b848b00e45301e8a7
diff --cc debian/changelog
index eb9df510,07d4fb04..9d0312f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,46 +1,71 @@@
- qbs (3.2.0-2+rpi1) forky-staging; urgency=medium
++qbs (3.3.0-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1.10.0+dfsg-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 06 Feb 2018 00:27:38 +0000]
 +  * Add symbols file hack for Raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 1.12.1+dfsg-2+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
 +  [changes introduced in 1.12.2+dfsg-1+rpi1 by Peter Michael Green]
 +  * Mark another symbol as optional. I'm guessing the presence or absesne of
 +    this one depends on optimisation descisions by the compiler and/or the
 +    version of libstdc++
 +
 +  [changes introduced in 1.13.1-2+rpi1 by Peter Michael Green]
 +  * Extend symbols file hack.
 +
 +  [changes introduced in 1.22.0-4+rpi1 by Peter Michael Green]
 +  * Further extend symbols file hack.
 +
 +  [changes introduced in 2.3.1-4+rpi1 by Peter Michael Green]
 +  * Update symbols file changes for qbs 2.x
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 22 May 2026 19:56:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 03 Jul 2026 13:26:54 +0000
++
+ qbs (3.3.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * Upload to unstable.
+   * New upstream release.
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 17 Jun 2026 22:30:34 +0200
+ 
+ qbs (3.3.0~git20260612.6f28341-1) experimental; urgency=medium
+ 
+   * Team upload.
+   * New development snapshot of the future 3.3.0 release.
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 12 Jun 2026 21:17:50 +0200
+ 
+ qbs (3.3.0~git20260529.6933e76-1) experimental; urgency=medium
+ 
+   * Team upload.
+   * New development snapshot of the future 3.3.0 release.
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 29 May 2026 20:55:08 +0200
+ 
+ qbs (3.3.0~git20260522.8e3c6dc-1) experimental; urgency=medium
+ 
+   * Team upload.
+   * New development snapshot of the future 3.3.0 release.
+   * Rename libqbscore3.2 to libqbscore3.3 according to the upstream SONAME
+     bump.
+   * Update the patches:
+     - upstream_Better-report-target-vs-host-differences.patch: drop, backported
+       from upstream
+   * Update copyright.
+   * Update install files.
+   * Tweak the way the upstream tests are run, both in dh_auto_test and in the
+     upstream-test-suite autopkgtest, to be more close to the upstream scripts:
+     - switch from "qbs-foo" commands to "qbs foo"
+     - in dh_auto_test, use a custom $QBS_AUTOTEST_SETTINGS_DIR directory under
+       the temporary $HOME
+     - use $QBS_AUTOTEST_PROFILE rather than hardcoding its value
+     - directly set $QBS_AUTOTEST_PROFILE.baseProfile as config without
+       additional checks
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 22 May 2026 06:20:48 +0200
  
  qbs (3.2.0-2) unstable; urgency=medium